Merged.
authoremellor@ewan <emellor@ewan>
Mon, 10 Oct 2005 13:46:53 +0000 (14:46 +0100)
committeremellor@ewan <emellor@ewan>
Mon, 10 Oct 2005 13:46:53 +0000 (14:46 +0100)

Trivial merge